From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 23 Mar 2015 10:13:15 +0000 (+0100)
Subject: Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts
X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~4731^2~73
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=e4518ab90f63cd5bea3ddc15341162debc34442b;p=linux-4.9.git

Merge tag 'v4.0-rc5' into x86/asm, to resolve conflicts

Conflicts:
	arch/x86/kernel/entry_64.S

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

e4518ab90f63cd5bea3ddc15341162debc34442b